From 0f3e2f839713aae83388d1df5d9406f2edfb69d5 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Tue, 13 Sep 2005 15:19:39 +0000 Subject: [PATCH] Move xshandle to xsutil.py, add IntroduceDomain, fix list to handle empty/non-existant directories and fix Remove. Signed-off-by: Christian Limpach --- tools/python/xen/xend/xenstore/xstransact.py | 16 ++++++---------- tools/python/xen/xend/xenstore/xsutil.py | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 tools/python/xen/xend/xenstore/xsutil.py diff --git a/tools/python/xen/xend/xenstore/xstransact.py b/tools/python/xen/xend/xenstore/xstransact.py index 0b8d8612a1..aa3c5eab62 100644 --- a/tools/python/xen/xend/xenstore/xstransact.py +++ b/tools/python/xen/xend/xenstore/xstransact.py @@ -7,14 +7,7 @@ import errno import threading from xen.lowlevel import xs - -handles = {} - -# XXX need to g/c handles from dead threads -def xshandle(): - if not handles.has_key(threading.currentThread()): - handles[threading.currentThread()] = xs.open() - return handles[threading.currentThread()] +from xen.xend.xenstore.xsutil import xshandle class xstransact: @@ -100,7 +93,10 @@ class xstransact: def _list(self, key): path = "%s/%s" % (self.path, key) - return map(lambda x: key + "/" + x, xshandle().ls(path)) + l = xshandle().ls(path) + if l: + return map(lambda x: key + "/" + x, l) + return [] def list(self, *args): if len(args) == 0: @@ -139,7 +135,7 @@ class xstransact: Write = classmethod(Write) - def Remove(cls, *args): + def Remove(cls, path, *args): while True: try: t = cls(path) diff --git a/tools/python/xen/xend/xenstore/xsutil.py b/tools/python/xen/xend/xenstore/xsutil.py new file mode 100644 index 0000000000..1dca916dd8 --- /dev/null +++ b/tools/python/xen/xend/xenstore/xsutil.py @@ -0,0 +1,20 @@ +# Copyright (C) 2005 Christian Limpach + +# This file is subject to the terms and conditions of the GNU General +# Public License. See the file "COPYING" in the main directory of +# this archive for more details. + +import threading +from xen.lowlevel import xs + +handles = {} + +# XXX need to g/c handles from dead threads +def xshandle(): + if not handles.has_key(threading.currentThread()): + handles[threading.currentThread()] = xs.open() + return handles[threading.currentThread()] + + +def IntroduceDomain(domid, page, port, path): + return xshandle().introduce_domain(domid, page, port, path) -- 2.30.2